From 0dc946da63b23fd60a2b36bca91604c2e9ae99a9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 8 Jul 2020 17:43:14 -0400
Subject: [PATCH] testsuite: Assorted leak fixes

All found by asan.
---
 testsuite/gtk/filtermodel.c      | 7 +++++--
 testsuite/gtk/shortcuts.c        | 2 ++
 testsuite/gtk/test-focus-chain.c | 1 +
 testsuite/gtk/textbuffer.c       | 1 +
 testsuite/reftests/gtk-reftest.c | 3 +++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/testsuite/gtk/filtermodel.c b/testsuite/gtk/filtermodel.c
index 53c1d93b6f..5b03a93cf2 100644
--- a/testsuite/gtk/filtermodel.c
+++ b/testsuite/gtk/filtermodel.c
@@ -5971,6 +5971,7 @@ specific_bug_346800 (void)
   columns[1] = G_TYPE_BOOLEAN;
   store = gtk_tree_store_newv (2, columns);
   model = GTK_TREE_MODEL (store);
+  GList *junk = NULL;
 
   /*http://bugzilla.gnome.org/show_bug.cgi?id=346800 */
 
@@ -5981,14 +5982,14 @@ specific_bug_346800 (void)
     {
       /* allocate random amounts of junk, otherwise the filter model's arrays can expand without moving */
 
-      g_malloc (138);
+      junk = g_list_append (junk, g_malloc (138));
       gtk_tree_store_append (store, &node_iters[i], NULL);
       gtk_tree_store_set (store, &node_iters[i],
                           0, "something",
                           1, ((i%6) == 0) ? FALSE : TRUE,
                           -1);
 
-      g_malloc (47);
+      junk = g_list_append (junk, g_malloc (47));
       gtk_tree_store_append (store, &child_iters[i], &node_iters[i]);
       gtk_tree_store_set (store, &child_iters[i],
                           0, "something else",
@@ -6007,6 +6008,8 @@ specific_bug_346800 (void)
           gtk_tree_model_filter_refilter (filter);
         }
     }
+
+  g_list_free_full (junk, g_free);
 }
 
 static gboolean
diff --git a/testsuite/gtk/shortcuts.c b/testsuite/gtk/shortcuts.c
index 887d53b3b0..085e3026e2 100644
--- a/testsuite/gtk/shortcuts.c
+++ b/testsuite/gtk/shortcuts.c
@@ -354,6 +354,8 @@ test_trigger_trigger (void)
         }
 
       gdk_event_unref (event);
+
+      g_free (keys);
     }
 
   gdk_surface_destroy (surface);
diff --git a/testsuite/gtk/test-focus-chain.c b/testsuite/gtk/test-focus-chain.c
index 5419dbc2ae..77ec3814d6 100644
--- a/testsuite/gtk/test-focus-chain.c
+++ b/testsuite/gtk/test-focus-chain.c
@@ -304,6 +304,7 @@ main (int argc, char **argv)
       g_error ("Option parsing failed: %s\n", error->message);
       return 1;
     }
+  g_option_context_free (context);
 
   gtk_init ();
 
diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c
index 33b3048d3d..1f2b95ff37 100644
--- a/testsuite/gtk/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
@@ -1360,6 +1360,7 @@ check_buffer_contents (GtkTextBuffer *buffer,
   gtk_text_buffer_get_end_iter (buffer, &end);
   buffer_contents = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
   g_assert_cmpstr (buffer_contents, ==, contents);
+  g_free (buffer_contents);
 }
 
 static void
diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
index 41e28c05b9..3fd90cd3e7 100644
--- a/testsuite/reftests/gtk-reftest.c
+++ b/testsuite/reftests/gtk-reftest.c
@@ -78,6 +78,7 @@ parse_command_line (int *argc, char ***argv)
       g_print ("option parsing failed: %s\n", error->message);
       return FALSE;
     }
+  g_option_context_free (context);
 
   for (i = 0; i < *argc; i++)
     {
@@ -325,6 +326,8 @@ test_ui_file (GFile *file)
     }
 
   remove_extra_css (provider);
+
+  g_free (ui_file);
 }
 
 static int
-- 
2.30.2